Correcting return logic for v1.1.8.5