MUS-82: Make code work in Eclipse