Fixed JPADAO