Finish resolving #1367