Java6 compliant - dirty fix version