Fixed additional bug (minor, see previous)