fixes fixes fixes by @slaFFik