[FIX] Not pretty but everything is working