FIX: a smell removing bug