Quick Source-Layout Fix