fix stupid issues