[995217] Bug fix final