Deleted some stuff from an old attempt at fixing Issue #33