also related to #74