Fixed bug introduced by eclipse auto-complete