Fixed #19

Fix