Better idea, let's make it work properly :)