Fixed implementation with wolfenswan's flashlights