Finally fixed that stupid wrapping bug