#1358 - Fixed forms