Fix #438

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
Fix #440

Signed-off-by: Ross Allan <rallanpcl@gmail.com>