Temp. fix for issue #37