Sample 4 bug-fix