Another dirty bugfix
More improvements