Fixed Reece's bug