Fix flikering Issue #14