Fixed nasty bug (hopefully)
Fixed nasty bug (hopefully)