Type and bugfix