Fixed Marius' Ctrl + shift + s problems