Bugfix for a28bf7410e6cb4cf5caadfc820dfad07aa8c8596