Fixed #4

Currently commented out the offending code. See if it ripples through any other libraries.