fix for issue#45