removed unnecessary workaround