Final Fix (Hoping, Stupid Maven and it's odd setup)