Workaround memory issue