Code fix: missing gaps added