Fix cs spopover

@marwa-mehanna review again :D