#86 Emit method return logic changed