[Bugfix] Bug #792. Additional fix.