Optimized fix #331