Maybe fixed a bug fingers crossed