Fixed return signature bug