fixed generator and custom