Fixed additional bug