tweaked bugfix style