Fix for issue147