Fix brown paper bug