Merge "Fixing alarm clock bug"