2nd part of previous commit due to eclipse