Fix for #28
Fix for #28 - 2