addresses #248