DON'T MERGE - Feature/capture error