master: Fixed a bug