bugfix and excluded main