hotfix and added some covers