Fixed a bit for Form 16