Fixed it properly