beautyfication fix from version 3