Mavenized project, bug fix