Fixing problems at #490

As the tile says: Fixing problems at #490.