Related to #146. Missing change.