Fixing BUG 13592