I was so proud of that complicated logic, and now you replace it with something simple, pah! ;)