Compability with R13 fixed. closes #1