fixing stupid issues