Fix for BUG_4