Fixing #530, thanks Daktyl for the patch