FIX: Compliance with Kaj's ansi binding