Focused minor bug