OK, so either this is needed or not - if not take it out, otherwise fix properly (surround with some switch or whatever...)