Fixing maybe #303?