Bug fix: Form populate bug