This time REALLY fixed #6