Fix "Non-void function should return a value"