Strategy bug fixing