Commit#4

Fixes