Fixed Jordy's bug....