#449 Fix after review