Fixes redmine #252