small fix and backend improvement