ugly fix for issue #32