Improved solution, fixed !important hack!