fixing issues argh