Fixing SE-1469