simple solution for issue #12