Should fix sandboxing problems