this should be updated with pr#308 ...