Proof-of-Concept fix