This may or may not help with #7. More testing is needed.