Fixed bug with subbing