Fix #51, double resolution of singleton dependencies