--- last commit bug fix (forntend 0.3.9)