Initailly I wrote something similar, but something forced me to this kludge...
Will fix in a second.