Optimization - fix for travis