Fixed a bug in master