Removed ugly workaround in last commit