Fixing one additional bug