BUG: Fixed issue 3504