Fixed issue #1 "Missing return value"