P04: Bug Fix