Reworking fix from 1.3