Fix #438Signed-off-by: Ross Allan <[email protected]> (commit: 7810390)
Fix #440Signed-off-by: Ross Allan <[email protected]> (commit: 2baf15d)