Sample simplified
Critical bugfix