fixed overflow issues
Composing