updated for chibi 2.6