fix that potentially closes #25