quicker and dirtier fix