#329 - Safer to use direct variable instead of "this" here