Fixed bug, last commit wasn't quite right