Fixed issue related to #1084