Woops, now proper fixed #4
(I hope).