slight bug with last push, fixed