Fix for BUG_22