fix #18, #19 from dicos issue tracker