Fixed #2255

Also see 0f93f81 in master