Fixed #APP-1128