sorry have to reopen #13. something much worse happened after fixing it...