#44 somewhat fixed