changes regarding isssue 1387