COMMIT 181014

Bug FIX