ui fix re: #505