bugfix and less verbose