fix dependencies.. should be more generic in the future..