quick solution for issue #32