Fix weird workaround with more appropriate solution.