Actually fix #561. return statements are important :p

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