Not really happy with the solution...