Issue solved no: 221,
Revision of 228, 227,233