BUGFIX for bartolini