Added fix for #252.
Milestone: 2.6