Corrected a small bug.
Merge branch 'gameplay'