Trying to resolve a WTF bug :) 2