Rough draft of fix