Fixed Issue #354 functions returning void