Fixed bug in C-s