removed ugly trick