CS Patch

@Hackwar please have a look here.