Fixed: failing unit test [Rayo-112]