GitHub #82 - Fix use order, assert arg order