Fixing bug related to lazy developer.