fix for #32 and #33. but for #33 i will change it like @jakobmoellers suggested