Fix for Epsilon patch