(awb) Fixes #19