Fix issue #11 using @leon's solution