Fixing SE-1664