Addressing problems in #274