Fixed proof of concept