Fix: Sometimes you have not to find the hardest solution...