Bugfix (@Pmaene)