Adirelle:
	- Fixes GH-86, thanks Derangement.
	- Fixes GH-66, probably.
