Attempt #3 at fixing winsuck