adding workarounds suggested by Jared