Things works a bit better