Fixed merge from dev

Should be fixed now