Finally fixed #3 for good