Fix to work in eclipse