Fix regarding #31. Don't know if it's really fixed.