Fix for BUG_18