Fix the weird behaviour in internal forms (#523)