Fix #187 and end the madness