Fixed Return Issues