Dikors/issue258