Fix for BUG_19