rlyndall: 4693870813_0edc6aedbb_b-fix