Added fix for issue 147