AvdP + LW: Fixed singletons!

Yaaaaaaaaaaay!