fixed bug according to rick