Fixed it for issue #12