Fixed wrong assumptions