Change alexey's bug