Try a cleaner way to fix the syck issues. This will be temporary until we convert to Pysch format.
Fixed Syck issue
Merge branch 'syck'