Fix default return code; based @cubicdaiya #31 code