BUg1 fix