S3 bugg corrected