Update #467 based on feedback

Closes #467
Yeah, I think that this might not be a good idea :/