Try solution for issue #12