Fixing sams broken build