Minor bugfix + discussion