Fix for eclipse portability