BUG squashed