Fix #439Signed-off-by: Ross Allan <[email protected]> (commit: f4e6c9f)
Fix #440Signed-off-by: Ross Allan <[email protected]> (commit: 189371f)