QFJ-799

pull request to fix QFJ-799