Hopefully fixed CS issue