revert faulty logic from 1.5.0