Fixed code overflow