Fixing #15
fixing #15