quickfix for #15. but does not fix the source problem