ok that was the correct 'hack' back in

@aashish24 please review and merge ;)