[WIP] Added fix for #632

This appears to fix the issue on my machine