Maybe fixed Liam W's bug