Please have a look now. Sorry, I'm terrible in testing :-(