attempt to fix 'setOnce' issues as outlined in #118