Well, this was a quick fix for the problem, so you can apply a real fix when you have time :)