Resolved ticket 1221