Have to commit so gavin doesn't fuck it up
Fixed bug