Fix for #27

i added a fix for #27