Fix for BUG_31
Merge