Fixes CS for #125