removed the temporary fix that allows to start halfway through