Fix for BUG_36