Fixed bug (ready for deployment i think)