Fixed commit #3