Database crazy person fixes :) ( <3 kevin)