Fix #278, fix #689

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