this should do it I think... fix #27