#228 solved