Undoing first hotfix for #32 as it didn't worked