In my opinion also fixes #3

Another thing to kill