proposed fixe for issue 148