attempt at fixing issue #35, it keeps popping up for some reason, hope to have squashed it forever now