fixed big bug