#369 Fix after review