#48 - optional behaviour due to performance drop