#26 resolved