#399 Fix